forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 127
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feat: Port Dunes (Arrakis) objects & turfs. Adds fur crafting #1519
Draft
dj-34
wants to merge
4
commits into
ss220club:master
Choose a base branch
from
dj-34:dunes_objects_turfs_and_mobs
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+276
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
the
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
label
Sep 16, 2024
dj-34
force-pushed
the
dunes_objects_turfs_and_mobs
branch
from
September 17, 2024 07:08
8ae4a46
to
63bf061
Compare
dj-34
changed the title
Feat: Port Dunes (Arrakis) objects, turfs and mobs
Feat: Port Dunes (Arrakis) objects & turfs. Adds fur crafting
Sep 17, 2024
dj-34
force-pushed
the
dunes_objects_turfs_and_mobs
branch
from
September 17, 2024 08:48
0d65358
to
74ae47b
Compare
AyIong
added
Do Not Merge
Не заливать. В ожидании хэда/хоста. Или просто временный тестмерж.
and removed
Do Not Merge
Не заливать. В ожидании хэда/хоста. Или просто временный тестмерж.
labels
Sep 25, 2024
AyIong
reviewed
Sep 25, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Раз уж ты сделал модуль для крафтов, не хочешь заодно все крафты собрать сюда?
/obj/structure/fluff/carpet/AltClick(mob/user) | ||
. = ..() | ||
if(user.incapacitated()) | ||
to_chat(user, span_warning("You can't do that right now!")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Можно и перевести же тучаты
dj-34
added
the
Stale Exempt
PR не может быть устаревшим. Видать кто-то подкупил хэда.
label
Oct 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
📜 CL валиден
Stale Exempt
PR не может быть устаревшим. Видать кто-то подкупил хэда.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Что этот PR делает
Почему это хорошо для игры
Больше вариантов для маппинга.
Изображения
Тестирование
На локалке.
Changelog
🆑
add: Добавлены новые небольшие ковры в виде объектов для крафта из меха (fur).
tweak: Теперь из меха можно скрафтить набор меховой одежды.
/:cl: